Cleaned up usage of benchmark frame work