Continued updating format to make code more readable