Source Cleanup and Updated readme