Better language usage in app