Minor fixes (typo, unused header)
Code style related changes