Revist masking convention

At the moment we negative the valid flag twice, we could probably make this cleaner