refactoring change to replayDefaults and verifyDefaults
source code formatting