commit before comment tidy