minor cleanup/refactor
Merge branch 'Final_Project'