[FIX] Fix guewen's comments: Improve the code