add typedef, fix mutable

Signed-off-by: aLekSer <gdocse@gmail.com>