Minor refactor to level loading