Begun cleaning up project