Modifications after comment from @krono.