Refactoring and extracting methods into their own methods