More benchmark organization
Make prettier