better naming convention
Merge branch 'master' of https://github.com/DWFry/cltcodeninjas
better naming convention