Add a function for measuring accuracy
Remove accuracy calculation