Documentation and eupspkg functions cleanup