Small style cleanups