Clean code for TopEDO Controller