updates based on comments and PEP8