Fixes CS : trailing spaces and unused use