Updated with proper formatting & indentation