Removed unused using statements.
Cleaned up event handler names
Cleaned up event handler names