Code clean up

Code clean up