Some clean-up + added headers