Tidy cleanup