Refactor

Prepare stateless