Code indentation clean up and other changes related to comments