code cleanup and README