Clearing up code