Additional code format cleanup