Some source code refactoring was done.