Making Code Review Changes

@jose-brabo-movile Brabo, please review my changes.