Small refactors/formatting changes