Coding Style
Add state field
Convert tabs to spaces