finished implementing helpers and cleaned up several classes