cleaned up and packed