Make prompt shorter and improve error detection