cleanup
simplify
adds one thing for "intentional"