Formatted code again