Little code maintenance