minor, restyle, cleanup