simplified code, that improves quality