Revert "A little refactoring."

This reverts commit d109a988c8e4f60cba81b29c5b5ad57834fce1c7.