More magic house number replacing with constants