I shouldn't put this many unrelated changes in one commit