Comment clean up ;)