One last readme tweak
Refactor and data parsing