cleanup prompt code, simplify