Clean up
better errors