Eliminated unnecessary bit-masking