Clean up specs, write Location class