Cleanup and unify commenting styles