Some code cleaning + beginning of a Char module