Grammar/structure cleanup (#6760)
Grammar/structure cleanup (#6760)

Signed-off-by: Chris Carman <9f4358d64f641ab177981ac1fc77aad9819cb41b@gmail.com>
Snickermicker/smarthome,Snickermicker/smarthome,Snickermicker/smarthome,Snickermicker/smarthome