Reformat and clean-up of example application