VFS-550 Code refactoring.