Clean headers -- fix #3 #4