Removed unnecessary syntax.

Signed off by: Daniel Alves <danpaulalves@gmail.com>
Extracted Calculator to a new class.
Tests Pending.
Signed off by: Daniel Alves <danpaulalves@gmail.com>