[AESH-245] refactored and corrected formatting.