refactor & rename