Reformat code to match standards: Phase 1