Removed redundant If statements.