Better formatting
Better error reporting