Cleared a few comments