tidy everything up