Code cleaning up for comment spec