Minor changes
Another implementation of normalization interface