Bunch of cleanup, moving to soft tabs to keep things consistent