Optimized references
Shortened some event handler names
More formatting help