Refactor/question

Fix State