moved around some common stuff