Reflect own state with classes
Refactor constructor