moved a couple things around more common convention