improve readme, restore order to code