Code refactoring, changes.