update/cleanup code + move verify_ordering and drag method to studio utils