some cleanup and readme change