Cleaned up CarPark class