Minor organization improvements