make code more readable /cc @drsnyder