Removed references to currentApp; refactored if statement
Added logs based on suggestions in main repo issue 11