style stuff, and comments cleanup

Signed-off-by: Nicole Chung <nchung@nascentdigital.com>