Applying lint refactoring.