Shorter methods to please code climate