moved methods into their respective objects