Moved constants; removed duplicate counter.
3 files changed