Did some sructuring