formatting + changed some types back