Updated rest of things' formatting