Don't mess up meaning upon save
Cleanup: simplified method logic
Cleanup: PEP8