Adjusted title slightly, and removed unnecessary handler