2013-Dec-14: Homework from review, refactorings and cleanup (ongoing)
2013-Dec-15: Homework from review, refactorings and cleanup (ongoing)