Removed redundant local variables