Additional cleanup for #190