Implemented pylint recommendations