Code Cleanup

* Code cleanup