Removed excess variables