Re: MSI: indentation and style cleanup