Refactor on the default formatter

attempt to make code climate happier.