[my-place] Refactoring: Code separation.