Removed some "magic numbers"