Readme and code cleaning