Cleaned the code (eg removed cahr)