clean up source code, modify Readme