Redesign to clean