refactor & clarify