Cleaned up debug prints and old, commented code