Fix code style (after merge)