Refactor commit 6919c1d6c slightly