title and code cleanup