prompt improvements
refactor