Clean up various style issues in manager.py. Re-order some methods for clearer view as well.
Merge pull request #191 from spectras/misc/cleanup

Clean up various style issues.