commit before tidy