cleaned up more mess