More code and README cleanup