small lang-style fix
optimize imports