Doing more code cleanup