Apply common style
Merge pull request #359 from Rise-Vision/chore/apply-common-style

Apply common style