Refactor: Main #2