Fix formatting and update documentation after merge (#807)

Fix formatting and update documentation after merge (#807) #259