cleaned up locations