refactoring - movement method call from state machine