Code formatting (8/18)

Code formatting