deleting garbage & better comments