Refactoring via class split up