File header, const correctness, other cosmetic stuff