Remove unnecessary spec helper method
Tweak spec setup for readability

Keeping local variables close to where they are used.