Clean up example names and simplify code