Assembly: parts reorganization and cleaning