Pedantic approach

Pedantic approach