Comment clean up and general whitespace updates