Incorporate final comments

Signed-off-by: dpulitano <danielpulitano@gmail.com>