Cleaned up unnecessary comments before sending out for code review