Removed redundacies