@emir-hasanbegovic updated sample application by cleaning up some of the code