Clean up the temporary code and change the measurement of time to minutes