[SRC] Reformat and class refactor