Refactored methods into the right classes.