more styling fixes and cleanups