Minor refactor of changes