removed some dead code, inscreased arrow function usage for hofs