cleaned up the setup methods