Code refactoring.
1 file changed