cleaning up and unify code style
Authored by: aprilsnows 2017-03-16
Parent(s): [12ddf1]
Child(ren): [4c81a3]