Replace macros with static constant members of retun codes.
Remove commented parts of code.