Consistent quote usage
Fixing comment length
Simplifying handler
Avoiding inline control structures