Clear up formatting