Minor refactor & removes some unnecessary requests