Refactor methods to the only place they're used