Replace bool by DismissStatus enum
Code cleanup