formatting changes and clean up of action/label errors