community masks - refactoring