Refactoring, lint cleanup.