Additional cleanup for #17