Cleaned up code. Got rid of test fields and removed commented print
calls.