fix indent
Clean up specs
Make error classes, extract step getter