Fix Deferred & replace tabs with spaces