Refactor arithmetic module

Some refactoring for arithmetic module + remove some un-necessary self.