Cleaning ec examples, enhancing the client