code formatting, clean-up