use pylint to bring code closer to PEP8 convention
Merge branch 'refactor'
resolve merge