Cleaned up event handlers