clean up of code

clean up of code