switching to a more consistent commenting style