Minor improvements to the amount of variables lying around
Update, primarily for a cheap joke