Readme update and code cleaning