Readme Updated, Some Code Cleanup