Cleaned spaces... again