Formatting and updated documentation