Refactor: Rename, move, comment