splittet into more single resposebility classes