Clean up formatting of initial handler a little.