Cleanup & reorganize.