chore(measurement): Some coment cleanup, etc.