APD-605: Formatted code