More code cleanup and README added.