cleaning
simplification