cleanup & reorganization