PEP-8 formatting; Use UsorFactory; All tests pass [MJ-155]