Major refactoring needed from AI generated code