Refactor: composed methods and duplication