Fix oversight from last commit and add a couple style cleanups