Cleaning up example code from archetype