refactoring for helper method
refactor code
style change
fix style bug