Use a block handler to return the store
Remove underscore prefix
Remove underscore prefixes