Formatting the codebase a bit and updates to the README.md