Remove inappropriate nesting in all states
Merge pull request #30 from FCStrike/master

Remove inappropriate nesting in all states