remove magic numbers, remove comment template