refactor to ruby style
branch1 change
master change