Refactor align