Cleanup code for the spinner, write specs