Adding comments and removing fat