A little code formatting and code cleanup #2