Get rid of testing spans
Cleaning up code, adding comments