cleaned up some status logic