Updated readme. Code improvements