Format fixes in handler packages