refactor CWSwizzleInstanceMethods not to use CWErrorTrap
refactor CWSwizzleClassMethods to not use CWErrorTrap
rename error keys with better names
remove TODO