some style updates and cleanups