updated and fixed formatting