Updated Formatting and rules