Fix commenting
Encapsulate the action listener