Minor cleanup and readme changes