Misc cleanup/conformity