Rearranged section, clean up