[AESH-245] Refactor and correction formatting.