Refactored Calculator and added Complement