Various code cleanup
Removed PEP 8 violations
Merge branch 'feature/refactor_shared_code_between_models' into develop