cleaned up after james examples