Refactored Note static finals to factory class