Refactored code; todos are now tasks
Merge branch 'refactoring'