Header and minor code cleanup (#125)