Rename style
Clean up MainHandler