starting the code clean up