Clean up of Code Comments