Tidy HEAD a bit