addressing code review comments (removing error codes)