Removed unnecesssary if statements