Code reformatting