Clean up, change to the right title