Added header info / little cleanup