clean up; change title