change error messages
refactor services