Removed duplicate vars