Move handlers to prototype
Formatting / whitespace