Code clean-up + fix headers