grouped by require type
style fixes