Applying code Review comments from csegura & emunoz