Refactoring must go on. Now on binary characteristics calculators.