android, executor, win - refactor