cleanup import ordering for @jerith