Removed text that would never display, fixed if conditions