Methods refactored and shortened.