Refactored as per PEP8
Removed doxy stuff