Refactoring: simplify user interaction, improve flexibility of configuration