more code format fixes