version bump and header cleaning