code cleanup (mostly whitespace)