Cleaned some stuff up by using ctor for string calculator