STY: Cleaner [ci skip]