clint refactoring