Added some suggestions and fixed one minor formatting issue