Cleaned up some more comment generation