Cleaning up var and algvar so only one class is required