Cleanup and add some extra variables.