removing tabulations instead of spaces (following PEP8 coding style)
Removed unused lines (followind PEP8 coding style)
Reformatted messages (following PEP8 coding style)
Reformatting comments (following PEP8 coding style)
Formatted code (followin PEP8 coding style)
Merge pull request #1 from henryx/master

Code review