add enhancements
cleaning