Fixed messaging and remove purposed if statements