Added some messages
Apply pep8