Readme update, code cleaning