further readability & comments about updating