Better readme
More code cleanup