Fix whitespace/indentation
Get rid of bullshit request specs
Spec refactor