Style cleanup + Started on named warps