Fixed empty if statements
Fixed assigning variable to itsself