Cleanup Code and comment code