cleaning, updated comments