Better to define constants and use them?  Also applies below.