diff --git a/libclient/nexusclient/client.go b/libclient/nexusclient/client.go
index 39d90f1094504e5d98243642d0e2ee6d5467eebd..a00be1a708054ea9155c54bf4877798d6d194b6b 100644
--- a/libclient/nexusclient/client.go
+++ b/libclient/nexusclient/client.go
@@ -45,7 +45,7 @@ func New(host string) (*NexusClient, error) {
 }
 
 // Authenticate a user.
-// curl --cacert ca-cert.pem -X POST https://localhost:8000/login -H 'Content-Type: application/json' -d '{"email": "johndoe@nexus.org", "pwd":"pipomolo"}'
+// curl -X POST https://localhost:8000/login -H 'Content-Type: application/json' -d '{"email": "janedoe@nexus.org", "pwd":"pipomolo"}'
 // Returns an JWT token if authentication succeeded or an error if it failed.
 // IMPORTANT: caller MUST call the Cleanup() function before exiting!
 func (nc *NexusClient) Authenticate(user, pwd string) (string, error) {
@@ -73,8 +73,7 @@ func (nc *NexusClient) Authenticate(user, pwd string) (string, error) {
 	}
 }
 
-// "Authenticate" by using an already established connection using a previously received token.
-// Useful when wanting to access the API without authenticating.
+// "Authenticate" by using an already established connection using a previously received token (typically with the Authenticate method).
 // IMPORTANT: caller MUST call the Cleanup() function before exiting!
 func (nc *NexusClient) AuthenticateWithToken(token string) error {
 	nc.client.SetAuthToken(token)
@@ -125,6 +124,10 @@ func (nc *NexusClient) RefreshToken() error {
 	}
 }
 
+//========================================================================================
+// Private methods
+//========================================================================================
+
 func (nc *NexusClient) getVMAttachCertFile() string {
 	return nc.certFile
 }
diff --git a/libclient/nexusclient/user.go b/libclient/nexusclient/user.go
index 81d18ddfb75b122c93670714727f71420b610b1e..cf1297583672e76e632fe0cae6452bd11df8b78e 100644
--- a/libclient/nexusclient/user.go
+++ b/libclient/nexusclient/user.go
@@ -139,6 +139,10 @@ func (nc *NexusClient) GetUsers() ([]params.UserWithoutPwd, error) {
 	}
 }
 
+//========================================================================================
+// Private methods
+//========================================================================================
+
 // Deserialize a list of users from an http response (no filtering).
 func deserializeUsers(resp *resty.Response) ([]params.UserWithoutPwd, error) {
 	users := []params.UserWithoutPwd{}
diff --git a/libclient/nexusclient/vm.go b/libclient/nexusclient/vm.go
index 91c8b5d3b692c091a82fcdbfee4f5f8faea9e571..abca0f0c5481cd425c9992a50b7b51b2225c6d64 100644
--- a/libclient/nexusclient/vm.go
+++ b/libclient/nexusclient/vm.go
@@ -25,7 +25,7 @@ const (
 )
 
 //========================================================================================
-// Public functions
+// Public methods
 //========================================================================================
 
 func (nc *NexusClient) VMCreate(p params.VMCreate) (*vm.VMNetworkSerialized, error) {
@@ -313,7 +313,7 @@ func (nc *NexusClient) GetListVM(vmID string) (*vm.VMNetworkSerialized, error) {
 }
 
 //========================================================================================
-// Private functions
+// Private methods
 //========================================================================================
 
 func (nc *NexusClient) vmGetSpiceCreds(vmID string, p params.VMAttachCreds) (*vm.VMSpiceCredentialsSerialized, error) {