Minor cleanup for #46
Adding #49