Sample App: make code more readable

Change-Id: I9e4dba4390337a57ea732ebd7061ba345412669d