Fix code according to our code style standard