Code and README cleanup