Cleaned up some changes I did to the code for debugging purposes.