Overall code cleanup, functionality should be unchanged.

1.1.0

Signed-off-by: Byron Marohn <combustible@live.com>