minor cleanups in code to make it shorted and updated README