status code clean ups

Instead of using hard-coded number, using enum/constant values