arrange imports a little better