Minor formatting / structure updates