Refactor: Remove duplicate logic on formatting checkers.
And in process fix a bug with string arguments not getting quoted