Clean up code (small)