Move active check to separate class