Major Code Reformatting