Refactor minor issues.