Refactor status alignment.