Adding proper return type