Removed unnecessary function wrapper