Removed quite a few comments