reformated code
Merge branch 'style'