Fix all CS issues
Merge pull request #930 from lovenunu/improve-cs

Fix all CS issues