net refactor stage 1 started: replace all magic numbers with names