further refactoring of requirements documentation