Reformat code to allow for mor dependencies