minor fixes and indenting