refactor calc condition removing period methods