Style tweak
Style tweaks
Remove map from stack middleware
Use Object.defineProperties