minor beautification again