Removed magical numbers