Feature/mobile confirmation cleanup

a little more cleanup, as requested by @yozlet