Cleanup: Reformat code