Minor cleanups

Signed-off-by: Bennie Leonard <bennie.leonard@gmail.com>
Merge pull request #14 from benniel/misc

Minor cleanups