Some small style cleanups