cleaning up code, investing performance'