Fix typo in comment
Perform less multiplications
Method to construct a bitmask
Remove unused method