Cleaned up the calculator