Clean up some commenting