Some refactoring on top of sclasen's change.
1 file changed