Code cleanup
Code clean up