rename incorrect register variables
refactor gate constructor

moved gate matrices into constructor as they're only 1-liners
and the symbols were getting assigned in the constructor