minor: cleans up imports, formatting