More consistency alterations + remove unused imports