Enhancement: Replaced string based "mode selection" with constants
Change: Removed method name grouping from all source code files
Trivial: Changed formatting of hanging indent to be PEP 8 conform