Improved documentation
End of refactor