Minor refactoring
Merge branch 'master' of https://github.com/GeoffreyLong/EC_AssignmentOne.git