Small refactorings and formatting changes in utilities