add title headers, remove unneeded code