Additional Comments
Misc Cleanup