Clean a bit Utils