minor changes, comments getting unclear