starting clean up of code