cleanup + reordering
More cleanup