code conventions
Smaller variable scopes
cleaned up fixtures a bit.