Breaking conditions only for better reading

Signed-off-by: Michael Granados <michaelgranados@gmail.com>
Typo coverage file

Signed-off-by: Michael Granados <michaelgranados@gmail.com>
Separating validation over execution of map method

Signed-off-by: Michael Granados <michaelgranados@gmail.com>