Performed renames from code review. Discovered bug with state storage and fixed it.
Improved fix and made it more concise.