removed some masking variables and superfluous codes