Cleaning up my commenting style