Touching up on new example
Simplify code