Clean up code [axof: 220]