session cleaning and style improvements