Reformatting some code for another round of testing