Fix: Store was instantiating Location incorrectly.

Also make some minor style improvements.