Better formatted code