Documentation refactored

Documentation refactored after receiving Tomas' suggestions.