Bit of cleanup/modernizing