Cleanup of masks (still incomplete just more presentable)