Update Methods & Formatting