removed unnecessary higher-order functions
removed unnecessary higher-order functions