Using binary data in dummy mode
Trivial cosmetics
Minor refactoring