Used 5 free minutes to clean up and test code