organizing imports; removing unneeded implicits; etc