Updated calculator to use more Ruby idiom and prep for OOP tasks