Removed some 'if' statements.