#760 Clean up variables

Great, thanks!