- Cleaned up return codes.