style and cleanups