Updated the readme and code tidy