Remove comments
Refactor to match today design clarification
Add state support