formatting and updates