Refactoring -> moving some code