readme
code simplifications