Refactoring - split into multiple methods