Minor code cleanup and README improvements