Fix spaces
Clean up