Mesh: Apply Minor refactoring