Minor cleanup in octane