Cleaned up benchmark code a little bit