Update for precedence and readability per #51