Removed redundant lines of code