Comment cleanup and consistent function comments
* small comment change