Cleanup the README

Small changes, code consistencies and easier to read.