improved code style
Merge branch 'gem'