Reorganize and clean up