Updates per review #11

Import ordering.