Use mess default variable setting and simplify/clean up vars