Budspencer: code simplification