Changed comments in order to comply with agreed upon standard