Just some changes that I would like to see

These are just a couple of changes, mostly unimportant...

You should have a look at "Add a LocationType Enum instead of using strings.", that commit might be a bit controversial. If you feel like discussing it please do :P