clean up code more