Runner introduced and calculator code refactored
Runner introduced and calculator code refactored