Prettier layout and more elegant handler handling.