AssertionConcern + refactoing