Additional cleanup for #197