Try to get rid of all that string plumbing
Require code only where is being used
Make the spec name more readable