Revert "Added a few comments, fixed a segfault"

This reverts commit e745f0b8ee9f6ebe2045945ae3e8dc3f1d43b84a.