Slight refactor of spinner directive prior to creating wait directive