Defined var instead of magic 16, code and comment tidy