Minor refactor done