minor cleanup, naming, styling