Redesign and cleaning 3