continue working with states

Some refactoring states code...