Updating dummy app for testing; Minor refactor