Updates per review #23

Import ordering