Removed faulty action listener logic
Added final modifiers
Removed unused imports