Cleanup directory, improve variable name.