Minor refactor/renaming/reordering