got specs passing and more idiomatic