minor edits to really improve dramatically on the crud Matt wrote