Minor refactor of ball logic