reformatted and a few updates