Cleanup and add more styles
Update example