Simplify and tidy example app