refactroing, docs