Tighten import lists and add comments