Refactor better method names