maintaining order; UI cleanup; code cleanup;