Make sightly idiomatic