Minor code formatting and clean-up.