fix style/validation issues