continued cleanup and organization