refactoring done
adjusting documentation