Some style refactor

[bd5c69e1ae5263946e1983bc875620d4a8c45808]