add: cleanup of session-data depending on action
chg: refactoring and code cleanup
chg: update according to css of QA