Added Stopwatch for benchmarking
Cleaned up