Cleanup for better documentation of variables.