cleanup
return keyword

fix some throwing error