Return resolved object from store
Formatting fixes