Improve code style following PEP8 and PEP257