Moved methods around