cleanup flash message listener naming and doc