Cleanup dead comment and excess whitespace