Some inconsequential refactoring