comments, refactor, adjustments