anal tidying, nothing functional changed
API version 66 notes