General code cleanups.
Merge branch 'master' of https://github.com/writemorecode/openbay