diff --git a/cmd/poseidon/main.go b/cmd/poseidon/main.go
index 4ba130a..b92fb30 100644
--- a/cmd/poseidon/main.go
+++ b/cmd/poseidon/main.go
@@ -253,13 +253,13 @@ func shutdownOnOSSignal(server *http.Server, ctx context.Context, stopProfiling
 	case <-ctx.Done():
 		os.Exit(1)
 	case <-writeProfileSignal:
-		log.Info("Received SIGUSR1 ...")
+		log.Info("Received SIGUSR1...")
 
 		stopProfiling()
 		// Continue listening on signals and replace `stopProfiling` with an empty function
 		shutdownOnOSSignal(server, ctx, func() {})
 	case <-shutdownSignals:
-		log.Info("Received SIGINT, shutting down ...")
+		log.Info("Received SIGINT, shutting down...")
 
 		defer stopProfiling()
 		ctx, cancel := context.WithTimeout(context.Background(), gracefulShutdownWait)
diff --git a/internal/api/ws/codeocean_reader.go b/internal/api/ws/codeocean_reader.go
index 283df88..4b4c677 100644
--- a/internal/api/ws/codeocean_reader.go
+++ b/internal/api/ws/codeocean_reader.go
@@ -32,7 +32,7 @@ type codeOceanToRawReader struct {
 	executorCtx context.Context
 
 	// A buffered channel of bytes is used to store data coming from CodeOcean via WebSocket
-	// and retrieve it when Read(..) is called. Since channels are thread-safe, we use one here
+	// and retrieve it when Read(...) is called. Since channels are thread-safe, we use one here
 	// instead of bytes.Buffer.
 	buffer chan byte
 	// The priorityBuffer is a buffer for injecting data into stdin of the execution from Poseidon,
diff --git a/internal/api/ws/codeocean_writer.go b/internal/api/ws/codeocean_writer.go
index 47396a2..8352fbe 100644
--- a/internal/api/ws/codeocean_writer.go
+++ b/internal/api/ws/codeocean_writer.go
@@ -59,7 +59,7 @@ type writingLoopMessage struct {
 }
 
 // NewCodeOceanOutputWriter provides an codeOceanOutputWriter for the time the context ctx is active.
-// The codeOceanOutputWriter handles all the messages defined in the websocket.schema.json (start, timeout, stdout, ..).
+// The codeOceanOutputWriter handles all the messages defined in the websocket.schema.json (start, timeout, stdout, ...).
 func NewCodeOceanOutputWriter(
 	connection Connection, ctx context.Context, done context.CancelFunc) WebSocketWriter {
 	cw := &codeOceanOutputWriter{
diff --git a/internal/environment/nomad_manager.go b/internal/environment/nomad_manager.go
index c3a7a88..47d228a 100644
--- a/internal/environment/nomad_manager.go
+++ b/internal/environment/nomad_manager.go
@@ -214,7 +214,7 @@ func (m *NomadEnvironmentManager) load() error {
 	for _, job := range templateJobs {
 		jobLogger := log.WithField("jobID", *job.ID)
 		if *job.Status != structs.JobStatusRunning {
-			jobLogger.Info("Job not running, skipping ...")
+			jobLogger.Info("Job not running, skipping...")
 			continue
 		}
 		configTaskGroup := nomad.FindAndValidateConfigTaskGroup(job)
diff --git a/internal/runner/nomad_manager.go b/internal/runner/nomad_manager.go
index fcfe2e5..90bc26f 100644
--- a/internal/runner/nomad_manager.go
+++ b/internal/runner/nomad_manager.go
@@ -174,7 +174,7 @@ func (m *NomadRunnerManager) load() {
 		usedRunners, err := m.loadEnvironment(environment)
 		if err != nil {
 			log.WithError(err).WithField(dto.KeyEnvironmentID, environment.ID().ToString()).
-				Warn("Failed loading environment. Skipping ...")
+				Warn("Failed loading environment. Skipping...")
 			continue
 		}
 		for _, r := range usedRunners.List() {
@@ -195,7 +195,7 @@ func (m *NomadRunnerManager) loadEnvironment(environment ExecutionEnvironment) (
 		r, isUsed, err := m.loadSingleJob(job, environment)
 		if err != nil {
 			log.WithError(err).WithField(dto.KeyEnvironmentID, environment.ID().ToString()).
-				WithField("used", isUsed).Warn("Failed loading job. Skipping ...")
+				WithField("used", isUsed).Warn("Failed loading job. Skipping...")
 			continue
 		} else if isUsed {
 			used.Add(r.ID(), r)
diff --git a/pkg/dto/dto.go b/pkg/dto/dto.go
index 217a859..6d674fe 100644
--- a/pkg/dto/dto.go
+++ b/pkg/dto/dto.go
@@ -130,7 +130,7 @@ type UpdateFileSystemRequest struct {
 // FilePath specifies the path of a file and is part of the UpdateFileSystemRequest.
 type FilePath string
 
-// EntryType specifies the type of the object (file/link/directory/..)
+// EntryType specifies the type of the object (file/link/directory/...)
 type EntryType string
 
 // These are the common entry types. You find others in the man pages `info ls`.