Cleaned up 'comments'