getting rid of magic constants - part 2