more consistency: Stop -> EFAStop
comments
clean up