simplification and more safety