Entire Refactor (MINOR) & Util class complete (COMMON)