[Cleaning raph code]