Minor Message refactor