Improved prompt; cleanup