refactor commented part a bit