Bug fixes, refactor for PEP8 compliance