Refactor session #202