Cleaning up more code