Refactor/more comments