Added map and quick tidy-up