Refactor, smaller methods