refactor, docs..