Beautifying demo code, Adding examples