clean up better closures a bit
clean up better closures a bit

felixvf/mirah,uujava/mirah,uujava/mirah,mirah/mirah,felixvf/mirah,uujava/mirah,felixvf/mirah,mirah/mirah,mirah/mirah,felixvf/mirah,mirah/mirah,uujava/mirah,uujava/mirah