cleaning up code?