Lots of Code Cleanup 
<Currently not working>