Apply ASSERT + Code refactoring