Reformatting for Build