Refactoring some points.