Feature/clean generated code