StyleCop
Add State class
Refactor Matrix class