Remove redandant braces
Remove require xxx_types
Fix sort order