Remove redundant use of variables