Refactoring: Extracted method
Minor code cleanup. Whitespace and comments
WIP
Merge branch 'master' into task_records
_MAJOR_ refactoring! Yup, in a single commit. Without a speaking commit message. That's right.