Status calculator refactoring