Cleaned Up Variables