Cleaned up some very repetitive code.
Merge branch 'master' of https://github.com/maxdeviant/bgj-05