More tidying, improved the log in README.md and made names more self-explaintory