Verificating if scopes have been improved. The header has been documented as well, following Doxygen format.