Stylistic fixes and cleanup