- removed needless if