diff --git a/pkg/mining/events.go b/pkg/mining/events.go
index 235b81d..d81efc2 100644
--- a/pkg/mining/events.go
+++ b/pkg/mining/events.go
@@ -361,8 +361,8 @@ func (client *wsClient) readPump() {
 			// Update miner subscription (protected by mutex)
 			client.minersMutex.Lock()
 			client.miners = make(map[string]bool)
-			for _, m := range clientMessage.Miners {
-				client.miners[m] = true
+			for _, minerName := range clientMessage.Miners {
+				client.miners[minerName] = true
 			}
 			client.minersMutex.Unlock()
 			logging.Debug("client subscribed to miners", logging.Fields{"miners": clientMessage.Miners})
diff --git a/pkg/mining/manager.go b/pkg/mining/manager.go
index 3aa099e..1da3841 100644
--- a/pkg/mining/manager.go
+++ b/pkg/mining/manager.go
@@ -372,11 +372,11 @@ func (m *Manager) UninstallMiner(ctx context.Context, minerType string) error {
 	minersToDelete := make([]string, 0)
 	minersToStop := make([]Miner, 0)
 	for name, runningMiner := range m.miners {
-		if rm, ok := runningMiner.(*XMRigMiner); ok && equalFold(rm.ExecutableName, minerType) {
+		if xmrigInstance, ok := runningMiner.(*XMRigMiner); ok && equalFold(xmrigInstance.ExecutableName, minerType) {
 			minersToStop = append(minersToStop, runningMiner)
 			minersToDelete = append(minersToDelete, name)
 		}
-		if rm, ok := runningMiner.(*TTMiner); ok && equalFold(rm.ExecutableName, minerType) {
+		if ttInstance, ok := runningMiner.(*TTMiner); ok && equalFold(ttInstance.ExecutableName, minerType) {
 			minersToStop = append(minersToStop, runningMiner)
 			minersToDelete = append(minersToDelete, name)
 		}
@@ -781,14 +781,14 @@ func (m *Manager) GetMinerHistoricalHashrate(minerName string, since, until time
 		return nil, ErrDatabaseError("database persistence is disabled")
 	}
 
-	dbPoints, err := database.GetHashrateHistory(minerName, database.ResolutionHigh, since, until)
+	databasePoints, err := database.GetHashrateHistory(minerName, database.ResolutionHigh, since, until)
 	if err != nil {
 		return nil, err
 	}
 
 	// Convert database points to mining points
-	points := make([]HashratePoint, len(dbPoints))
-	for i, databasePoint := range dbPoints {
+	points := make([]HashratePoint, len(databasePoints))
+	for i, databasePoint := range databasePoints {
 		points[i] = HashratePoint{
 			Timestamp: databasePoint.Timestamp,
 			Hashrate:  databasePoint.Hashrate,