FPD-103 Fixing styles and cleanup for sample application

Minor style and general cleanup for the sample application.