removed unnecessary function expressions