Code reformatting again