Addressed few review feedbacks
Merge pull request #1500 from Benglin/BubbleBurst

Addressed few code review comments