light clean-up: white space, etc