Controller : remove redundancy