Minor refactoring & typo fixes
Tuesday homework push commit