Style tweaks and cleanups