Cleanup code & specs
benchmark file