Minor clean ups for readability