Code clean up

code clean up