cleanup
typo
error handling