Removed the remaining magic numbers that were left