Tweaks and remove duplicate strings that I accidentally added