Fix package comment and reorder imports