Major coding style changes, shouldn't be any visual effect

Signed-off-by: Steven Hoffman <git@fustrate.com>