Janitorial clean-up of source code - formatting only