Updated comments, formatting as per review feedback