general code/header clean up