Commented constants and made utility funcs