Misc Changes/Code Clean Up