Refactoring and code consistency: Should be finished.