Code clean up

^