Updates per review #25

Import ordering.