moved methods into a category and cleaned up the setup.