Formatting, readme and other cleanup