minor refactoring, cleaned up mask & wound