remove useless actionListener from controller & refactor