Fix initializable trait
Calculator: trait -> class