All around organization and cleanup for presentation