Apply Coding Style
Fix bugs in 37273201298af85376afaded34ac190fde9f9909