Second pass cleaning

Same thing