Fixing and removing some comments