Cleaned up action listeners