doing some code clean and and adding some code