Refactor static controller