Impove comments

Better and more readable comments.