Begin refactor of NFL specs