refine spacing of some things, simplify rules