Comments clean up