Improves code readibility and tests
initial sessions work