Feature/cleanup

Getting set to write some bug-fixes here, might as well tidy up a bit while I'm here.

@wesdotcool @otherjonvb