Code cleanup and README