Refactored and shortened methods