formatting,commenting and few updates