Code formatting (7/18)

Code formatting