Refactorings and Implemented each contextual suspect behaviour