Minor refactor for readability and loading of correct data