Improve readability of masks