Replaced some magic values with variables