Formatting and remove makeQualified.