Refactor method definitions