tidy cleanup