Clean headers and code