removed the init for calculation storage... it made things hard to read