While we touching this, shall we remove the magic numbers?