Make changes for Mike C and a portion of Mike G's recommendations

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