cleanup changes; added header