failed to return a value
a few cleanups