Move methods around
More spec refactoring