Cosmetic changes to be more compliant to PEP 8

Also, removing commented code and fixed an issue with nedroid where
a piece of information was stored instead of another.