Cleaning up and organizing.