Start work on code cleanup