style cleanup
simplify and rename