Clean up code, part two