some cleaning
added some code
changes