cleaned up more