Small refactor session